From fe889de8198a4246048f92e4dcdbe243005c87b3 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Mon, 2 Aug 2004 18:48:45 +0000 Subject: [PATCH] bitkeeper revision 1.1108.33.34 (410e8c8d9bg1RHJ13Fqr_i-Yov0kRg) fix merge botch --- linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c index 658f7e267e..c5d12db779 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c @@ -122,10 +122,9 @@ static void __ctrl_if_tx_tasklet(unsigned long data) if ( was_full && !TX_FULL(ctrl_if) ) { + wake_up(&ctrl_if_tx_wait); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) run_task_queue(&ctrl_if_tx_tq); -#else - wake_up(&ctrl_if_tx_wait); #endif } } -- 2.30.2